diff --git a/docs/assets/tensorboard.jpg b/docs/assets/tensorboard.jpg
new file mode 100644
index 000000000..2aefa869d
Binary files /dev/null and b/docs/assets/tensorboard.jpg differ
diff --git a/docs/configuration.md b/docs/configuration.md
index 556414e21..e773e1878 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -215,16 +215,18 @@ Mandatory parameters are marked as **Required**, which means that they are requi
| `telegram.balance_dust_level` | Dust-level (in stake currency) - currencies with a balance below this will not be shown by `/balance`.
**Datatype:** float
| `telegram.reload` | Allow "reload" buttons on telegram messages.
*Defaults to `True`.
**Datatype:** boolean
| `telegram.notification_settings.*` | Detailed notification settings. Refer to the [telegram documentation](telegram-usage.md) for details.
**Datatype:** dictionary
+| `telegram.allow_custom_messages` | Enable the sending of Telegram messages from strategies via the dataprovider.send_msg() function.
**Datatype:** Boolean
| | **Webhook**
| `webhook.enabled` | Enable usage of Webhook notifications
**Datatype:** Boolean
| `webhook.url` | URL for the webhook. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
-| `webhook.webhookentry` | Payload to send on entry. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
-| `webhook.webhookentrycancel` | Payload to send on entry order cancel. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
-| `webhook.webhookentryfill` | Payload to send on entry order filled. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
-| `webhook.webhookexit` | Payload to send on exit. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
-| `webhook.webhookexitcancel` | Payload to send on exit order cancel. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
-| `webhook.webhookexitfill` | Payload to send on exit order filled. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
-| `webhook.webhookstatus` | Payload to send on status calls. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
+| `webhook.entry` | Payload to send on entry. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
+| `webhook.entry_cancel` | Payload to send on entry order cancel. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
+| `webhook.entry_fill` | Payload to send on entry order filled. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
+| `webhook.exit` | Payload to send on exit. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
+| `webhook.exit_cancel` | Payload to send on exit order cancel. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
+| `webhook.exit_fill` | Payload to send on exit order filled. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
+| `webhook.status` | Payload to send on status calls. Only required if `webhook.enabled` is `true`. See the [webhook documentation](webhook-config.md) for more details.
**Datatype:** String
+| `webhook.allow_custom_messages` | Enable the sending of Webhook messages from strategies via the dataprovider.send_msg() function.
**Datatype:** Boolean
| | **Rest API / FreqUI / Producer-Consumer**
| `api_server.enabled` | Enable usage of API Server. See the [API Server documentation](rest-api.md) for more details.
**Datatype:** Boolean
| `api_server.listen_ip_address` | Bind IP address. See the [API Server documentation](rest-api.md) for more details.
**Datatype:** IPv4
diff --git a/docs/deprecated.md b/docs/deprecated.md
index beceb12ab..3b5b28b81 100644
--- a/docs/deprecated.md
+++ b/docs/deprecated.md
@@ -66,11 +66,11 @@ We will keep a compatibility layer for 1-2 versions (so both `buy_tag` and `ente
#### Naming changes
-Webhook terminology changed from "sell" to "exit", and from "buy" to "entry".
+Webhook terminology changed from "sell" to "exit", and from "buy" to "entry", removing "webhook" in the process.
-* `webhookbuy` -> `webhookentry`
-* `webhookbuyfill` -> `webhookentryfill`
-* `webhookbuycancel` -> `webhookentrycancel`
-* `webhooksell` -> `webhookexit`
-* `webhooksellfill` -> `webhookexitfill`
-* `webhooksellcancel` -> `webhookexitcancel`
+* `webhookbuy`, `webhookentry` -> `entry`
+* `webhookbuyfill`, `webhookentryfill` -> `entry_fill`
+* `webhookbuycancel`, `webhookentrycancel` -> `entry_cancel`
+* `webhooksell`, `webhookexit` -> `exit`
+* `webhooksellfill`, `webhookexitfill` -> `exit_fill`
+* `webhooksellcancel`, `webhookexitcancel` -> `exit_cancel`
diff --git a/docs/freqai-running.md b/docs/freqai-running.md
index b8994aed9..f6aa7b2e1 100644
--- a/docs/freqai-running.md
+++ b/docs/freqai-running.md
@@ -142,6 +142,20 @@ dataframe['outlier'] = np.where(dataframe['DI_values'] > self.di_max.value/10, 1
This specific hyperopt would help you understand the appropriate `DI_values` for your particular parameter space.
+## Using Tensorboard
+
+Catboost models benefit from tracking training metrics via Tensorboard. You can take advantage of the FreqAI integration to track training and evaluation performance across all coins and across all retrainings. Tensorboard is activated via the following command:
+
+```bash
+cd freqtrade
+tensorboard --logdir user_data/models/unique-id
+```
+
+where `unique-id` is the `identifier` set in the `freqai` configuration file. This command must be run in a separate shell if the user wishes to view the output in their browser at 127.0.0.1:6060 (6060 is the default port used by Tensorboard).
+
+
+
+
## Setting up a follower
You can indicate to the bot that it should not train models, but instead should look for models trained by a leader with a specific `identifier` by defining:
diff --git a/docs/strategy_migration.md b/docs/strategy_migration.md
index ac65abff4..f93efd067 100644
--- a/docs/strategy_migration.md
+++ b/docs/strategy_migration.md
@@ -43,19 +43,25 @@ Note : `forcesell`, `forcebuy`, `emergencysell` are changed to `force_exit`, `fo
* `order_time_in_force` buy -> entry, sell -> exit.
* `order_types` buy -> entry, sell -> exit.
* `unfilledtimeout` buy -> entry, sell -> exit.
+ * `ignore_buying_expired_candle_after` -> moved to root level instead of "ask_strategy/exit_pricing"
* Terminology changes
* Sell reasons changed to reflect the new naming of "exit" instead of sells. Be careful in your strategy if you're using `exit_reason` checks and eventually update your strategy.
* `sell_signal` -> `exit_signal`
* `custom_sell` -> `custom_exit`
* `force_sell` -> `force_exit`
* `emergency_sell` -> `emergency_exit`
+ * Order pricing
+ * `bid_strategy` -> `entry_pricing`
+ * `ask_strategy` -> `exit_pricing`
+ * `ask_last_balance` -> `price_last_balance`
+ * `bid_last_balance` -> `price_last_balance`
* Webhook terminology changed from "sell" to "exit", and from "buy" to entry
- * `webhookbuy` -> `webhookentry`
- * `webhookbuyfill` -> `webhookentryfill`
- * `webhookbuycancel` -> `webhookentrycancel`
- * `webhooksell` -> `webhookexit`
- * `webhooksellfill` -> `webhookexitfill`
- * `webhooksellcancel` -> `webhookexitcancel`
+ * `webhookbuy` -> `entry`
+ * `webhookbuyfill` -> `entry_fill`
+ * `webhookbuycancel` -> `entry_cancel`
+ * `webhooksell` -> `exit`
+ * `webhooksellfill` -> `exit_fill`
+ * `webhooksellcancel` -> `exit_cancel`
* Telegram notification settings
* `buy` -> `entry`
* `buy_fill` -> `entry_fill`
@@ -443,6 +449,7 @@ Please refer to the [pricing documentation](configuration.md#prices-used-for-ord
"use_order_book": true,
"order_book_top": 1,
"bid_last_balance": 0.0
+ "ignore_buying_expired_candle_after": 120
}
}
```
@@ -466,6 +473,7 @@ after:
"use_order_book": true,
"order_book_top": 1,
"price_last_balance": 0.0
- }
+ },
+ "ignore_buying_expired_candle_after": 120
}
```
diff --git a/docs/telegram-usage.md b/docs/telegram-usage.md
index 055512f26..db4a309d0 100644
--- a/docs/telegram-usage.md
+++ b/docs/telegram-usage.md
@@ -77,6 +77,7 @@ Example configuration showing the different settings:
"enabled": true,
"token": "your_telegram_token",
"chat_id": "your_telegram_chat_id",
+ "allow_custom_messages": true,
"notification_settings": {
"status": "silent",
"warning": "on",
@@ -115,6 +116,7 @@ Example configuration showing the different settings:
`show_candle` - show candle values as part of entry/exit messages. Only possible values are `"ohlc"` or `"off"`.
`balance_dust_level` will define what the `/balance` command takes as "dust" - Currencies with a balance below this will be shown.
+`allow_custom_messages` completely disable strategy messages.
`reload` allows you to disable reload-buttons on selected messages.
## Create a custom keyboard (command shortcut buttons)
diff --git a/docs/webhook-config.md b/docs/webhook-config.md
index 3677ebe89..00c369919 100644
--- a/docs/webhook-config.md
+++ b/docs/webhook-config.md
@@ -10,37 +10,37 @@ Sample configuration (tested using IFTTT).
"webhook": {
"enabled": true,
"url": "https://maker.ifttt.com/trigger//with/key//",
- "webhookentry": {
+ "entry": {
"value1": "Buying {pair}",
"value2": "limit {limit:8f}",
"value3": "{stake_amount:8f} {stake_currency}"
},
- "webhookentrycancel": {
+ "entry_cancel": {
"value1": "Cancelling Open Buy Order for {pair}",
"value2": "limit {limit:8f}",
"value3": "{stake_amount:8f} {stake_currency}"
},
- "webhookentryfill": {
+ "entry_fill": {
"value1": "Buy Order for {pair} filled",
"value2": "at {open_rate:8f}",
"value3": ""
},
- "webhookexit": {
+ "exit": {
"value1": "Exiting {pair}",
"value2": "limit {limit:8f}",
"value3": "profit: {profit_amount:8f} {stake_currency} ({profit_ratio})"
},
- "webhookexitcancel": {
+ "exit_cancel": {
"value1": "Cancelling Open Exit Order for {pair}",
"value2": "limit {limit:8f}",
"value3": "profit: {profit_amount:8f} {stake_currency} ({profit_ratio})"
},
- "webhookexitfill": {
+ "exit_fill": {
"value1": "Exit Order for {pair} filled",
"value2": "at {close_rate:8f}.",
"value3": ""
},
- "webhookstatus": {
+ "status": {
"value1": "Status: {status}",
"value2": "",
"value3": ""
@@ -57,7 +57,7 @@ You can set the POST body format to Form-Encoded (default), JSON-Encoded, or raw
"enabled": true,
"url": "https://.cloud.mattermost.com/hooks/",
"format": "json",
- "webhookstatus": {
+ "status": {
"text": "Status: {status}"
}
},
@@ -88,17 +88,30 @@ Optional parameters are available to enable automatic retries for webhook messag
"url": "https://",
"retries": 3,
"retry_delay": 0.2,
- "webhookstatus": {
+ "status": {
"status": "Status: {status}"
}
},
```
+Custom messages can be sent to Webhook endpoints via the `self.dp.send_msg()` function from within the strategy. To enable this, set the `allow_custom_messages` option to `true`:
+
+```json
+ "webhook": {
+ "enabled": true,
+ "url": "https://",
+ "allow_custom_messages": true,
+ "strategy_msg": {
+ "status": "StrategyMessage: {msg}"
+ }
+ },
+```
+
Different payloads can be configured for different events. Not all fields are necessary, but you should configure at least one of the dicts, otherwise the webhook will never be called.
-### Webhookentry
+### Entry
-The fields in `webhook.webhookentry` are filled when the bot executes a long/short. Parameters are filled using string.format.
+The fields in `webhook.entry` are filled when the bot executes a long/short. Parameters are filled using string.format.
Possible parameters are:
* `trade_id`
@@ -118,9 +131,9 @@ Possible parameters are:
* `current_rate`
* `enter_tag`
-### Webhookentrycancel
+### Entry cancel
-The fields in `webhook.webhookentrycancel` are filled when the bot cancels a long/short order. Parameters are filled using string.format.
+The fields in `webhook.entry_cancel` are filled when the bot cancels a long/short order. Parameters are filled using string.format.
Possible parameters are:
* `trade_id`
@@ -139,9 +152,9 @@ Possible parameters are:
* `current_rate`
* `enter_tag`
-### Webhookentryfill
+### Entry fill
-The fields in `webhook.webhookentryfill` are filled when the bot filled a long/short order. Parameters are filled using string.format.
+The fields in `webhook.entry_fill` are filled when the bot filled a long/short order. Parameters are filled using string.format.
Possible parameters are:
* `trade_id`
@@ -160,9 +173,9 @@ Possible parameters are:
* `current_rate`
* `enter_tag`
-### Webhookexit
+### Exit
-The fields in `webhook.webhookexit` are filled when the bot exits a trade. Parameters are filled using string.format.
+The fields in `webhook.exit` are filled when the bot exits a trade. Parameters are filled using string.format.
Possible parameters are:
* `trade_id`
@@ -184,9 +197,9 @@ Possible parameters are:
* `open_date`
* `close_date`
-### Webhookexitfill
+### Exit fill
-The fields in `webhook.webhookexitfill` are filled when the bot fills a exit order (closes a Trade). Parameters are filled using string.format.
+The fields in `webhook.exit_fill` are filled when the bot fills a exit order (closes a Trade). Parameters are filled using string.format.
Possible parameters are:
* `trade_id`
@@ -209,9 +222,9 @@ Possible parameters are:
* `open_date`
* `close_date`
-### Webhookexitcancel
+### Exit cancel
-The fields in `webhook.webhookexitcancel` are filled when the bot cancels a exit order. Parameters are filled using string.format.
+The fields in `webhook.exit_cancel` are filled when the bot cancels a exit order. Parameters are filled using string.format.
Possible parameters are:
* `trade_id`
@@ -234,9 +247,9 @@ Possible parameters are:
* `open_date`
* `close_date`
-### Webhookstatus
+### Status
-The fields in `webhook.webhookstatus` are used for regular status messages (Started / Stopped / ...). Parameters are filled using string.format.
+The fields in `webhook.status` are used for regular status messages (Started / Stopped / ...). Parameters are filled using string.format.
The only possible value here is `{status}`.
@@ -280,7 +293,6 @@ You can configure this as follows:
}
```
-
The above represents the default (`exit_fill` and `entry_fill` are optional and will default to the above configuration) - modifications are obviously possible.
Available fields correspond to the fields for webhooks and are documented in the corresponding webhook sections.
@@ -288,3 +300,13 @@ Available fields correspond to the fields for webhooks and are documented in the
The notifications will look as follows by default.
+
+Custom messages can be sent from a strategy to Discord endpoints via the dataprovider.send_msg() function. To enable this, set the `allow_custom_messages` option to `true`:
+
+```json
+ "discord": {
+ "enabled": true,
+ "webhook_url": "https://discord.com/api/webhooks/",
+ "allow_custom_messages": true,
+ },
+```
diff --git a/freqtrade/constants.py b/freqtrade/constants.py
index e0eb5e288..2fdb091a7 100644
--- a/freqtrade/constants.py
+++ b/freqtrade/constants.py
@@ -5,7 +5,7 @@ bot constants
"""
from typing import Any, Dict, List, Literal, Tuple
-from freqtrade.enums import CandleType
+from freqtrade.enums import CandleType, RPCMessageType
DEFAULT_CONFIG = 'config.json'
@@ -282,6 +282,7 @@ CONF_SCHEMA = {
'enabled': {'type': 'boolean'},
'token': {'type': 'string'},
'chat_id': {'type': 'string'},
+ 'allow_custom_messages': {'type': 'boolean', 'default': True},
'balance_dust_level': {'type': 'number', 'minimum': 0.0},
'notification_settings': {
'type': 'object',
@@ -344,6 +345,8 @@ CONF_SCHEMA = {
'format': {'type': 'string', 'enum': WEBHOOK_FORMAT_OPTIONS, 'default': 'form'},
'retries': {'type': 'integer', 'minimum': 0},
'retry_delay': {'type': 'number', 'minimum': 0},
+ **dict([(x, {'type': 'object'}) for x in RPCMessageType]),
+ # Below -> Deprecated
'webhookentry': {'type': 'object'},
'webhookentrycancel': {'type': 'object'},
'webhookentryfill': {'type': 'object'},
@@ -653,5 +656,6 @@ LongShort = Literal['long', 'short']
EntryExit = Literal['entry', 'exit']
BuySell = Literal['buy', 'sell']
MakerTaker = Literal['maker', 'taker']
+BidAsk = Literal['bid', 'ask']
Config = Dict[str, Any]
diff --git a/freqtrade/exchange/binance.py b/freqtrade/exchange/binance.py
index a0d4b2d82..6d818bab9 100644
--- a/freqtrade/exchange/binance.py
+++ b/freqtrade/exchange/binance.py
@@ -11,6 +11,7 @@ from freqtrade.enums import CandleType, MarginMode, TradingMode
from freqtrade.exceptions import DDosProtection, OperationalException, TemporaryError
from freqtrade.exchange import Exchange
from freqtrade.exchange.common import retrier
+from freqtrade.exchange.types import Tickers
from freqtrade.misc import deep_merge_dicts, json_load
@@ -59,7 +60,7 @@ class Binance(Exchange):
)
))
- def get_tickers(self, symbols: Optional[List[str]] = None, cached: bool = False) -> Dict:
+ def get_tickers(self, symbols: Optional[List[str]] = None, cached: bool = False) -> Tickers:
tickers = super().get_tickers(symbols=symbols, cached=cached)
if self.trading_mode == TradingMode.FUTURES:
# Binance's future result has no bid/ask values.
diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py
index c41a84450..53a3960b1 100644
--- a/freqtrade/exchange/exchange.py
+++ b/freqtrade/exchange/exchange.py
@@ -20,8 +20,8 @@ from ccxt import ROUND_DOWN, ROUND_UP, TICK_SIZE, TRUNCATE, decimal_to_precision
from dateutil import parser
from pandas import DataFrame, concat
-from freqtrade.constants import (DEFAULT_AMOUNT_RESERVE_PERCENT, NON_OPEN_EXCHANGE_STATES, BuySell,
- Config, EntryExit, ListPairsWithTimeframes, MakerTaker,
+from freqtrade.constants import (DEFAULT_AMOUNT_RESERVE_PERCENT, NON_OPEN_EXCHANGE_STATES, BidAsk,
+ BuySell, Config, EntryExit, ListPairsWithTimeframes, MakerTaker,
PairWithTimeframe)
from freqtrade.data.converter import clean_ohlcv_dataframe, ohlcv_to_dataframe, trades_dict_to_list
from freqtrade.enums import OPTIMIZE_MODES, CandleType, MarginMode, TradingMode
@@ -31,6 +31,7 @@ from freqtrade.exceptions import (DDosProtection, ExchangeError, InsufficientFun
from freqtrade.exchange.common import (API_FETCH_ORDER_RETRY_COUNT, BAD_EXCHANGES,
EXCHANGE_HAS_OPTIONAL, EXCHANGE_HAS_REQUIRED,
remove_credentials, retrier, retrier_async)
+from freqtrade.exchange.types import Ticker, Tickers
from freqtrade.misc import (chunks, deep_merge_dicts, file_dump_json, file_load_json,
safe_value_fallback2)
from freqtrade.plugins.pairlist.pairlist_helpers import expand_pairlist
@@ -1420,14 +1421,17 @@ class Exchange:
raise OperationalException(e) from e
@retrier
- def get_tickers(self, symbols: Optional[List[str]] = None, cached: bool = False) -> Dict:
+ def get_tickers(self, symbols: Optional[List[str]] = None, cached: bool = False) -> Tickers:
"""
:param cached: Allow cached result
:return: fetch_tickers result
"""
+ tickers: Tickers
+ if not self.exchange_has('fetchTickers'):
+ return {}
if cached:
with self._cache_lock:
- tickers = self._fetch_tickers_cache.get('fetch_tickers')
+ tickers = self._fetch_tickers_cache.get('fetch_tickers') # type: ignore
if tickers:
return tickers
try:
@@ -1450,12 +1454,12 @@ class Exchange:
# Pricing info
@retrier
- def fetch_ticker(self, pair: str) -> dict:
+ def fetch_ticker(self, pair: str) -> Ticker:
try:
if (pair not in self.markets or
self.markets[pair].get('active', False) is False):
raise ExchangeError(f"Pair {pair} not available")
- data = self._api.fetch_ticker(pair)
+ data: Ticker = self._api.fetch_ticker(pair)
return data
except ccxt.DDoSProtection as e:
raise DDosProtection(e) from e
@@ -1506,7 +1510,7 @@ class Exchange:
except ccxt.BaseError as e:
raise OperationalException(e) from e
- def _get_price_side(self, side: str, is_short: bool, conf_strategy: Dict) -> str:
+ def _get_price_side(self, side: str, is_short: bool, conf_strategy: Dict) -> BidAsk:
price_side = conf_strategy['price_side']
if price_side in ('same', 'other'):
@@ -1525,7 +1529,7 @@ class Exchange:
def get_rate(self, pair: str, refresh: bool,
side: EntryExit, is_short: bool,
- order_book: Optional[dict] = None, ticker: Optional[dict] = None) -> float:
+ order_book: Optional[dict] = None, ticker: Optional[Ticker] = None) -> float:
"""
Calculates bid/ask target
bid rate - between current ask price and last price
diff --git a/freqtrade/exchange/kraken.py b/freqtrade/exchange/kraken.py
index 6c9b88eae..f3a9486f2 100644
--- a/freqtrade/exchange/kraken.py
+++ b/freqtrade/exchange/kraken.py
@@ -12,6 +12,7 @@ from freqtrade.exceptions import (DDosProtection, InsufficientFundsError, Invali
OperationalException, TemporaryError)
from freqtrade.exchange import Exchange
from freqtrade.exchange.common import retrier
+from freqtrade.exchange.types import Tickers
logger = logging.getLogger(__name__)
@@ -45,7 +46,7 @@ class Kraken(Exchange):
return (parent_check and
market.get('darkpool', False) is False)
- def get_tickers(self, symbols: Optional[List[str]] = None, cached: bool = False) -> Dict:
+ def get_tickers(self, symbols: Optional[List[str]] = None, cached: bool = False) -> Tickers:
# Only fetch tickers for current stake currency
# Otherwise the request for kraken becomes too large.
symbols = list(self.get_markets(quote_currencies=[self._config['stake_currency']]))
diff --git a/freqtrade/exchange/types.py b/freqtrade/exchange/types.py
new file mode 100644
index 000000000..a60b454d4
--- /dev/null
+++ b/freqtrade/exchange/types.py
@@ -0,0 +1,16 @@
+from typing import Dict, Optional, TypedDict
+
+
+class Ticker(TypedDict):
+ symbol: str
+ ask: Optional[float]
+ askVolume: Optional[float]
+ bid: Optional[float]
+ bidVolume: Optional[float]
+ last: Optional[float]
+ quoteVolume: Optional[float]
+ baseVolume: Optional[float]
+ # Several more - only listing required.
+
+
+Tickers = Dict[str, Ticker]
diff --git a/freqtrade/freqai/data_kitchen.py b/freqtrade/freqai/data_kitchen.py
index 9a9e7631b..d2dc1fc63 100644
--- a/freqtrade/freqai/data_kitchen.py
+++ b/freqtrade/freqai/data_kitchen.py
@@ -245,6 +245,7 @@ class FreqaiDataKitchen:
self.data["filter_drop_index_training"] = drop_index
else:
+ filtered_df = self.check_pred_labels(filtered_df)
# we are backtesting so we need to preserve row number to send back to strategy,
# so now we use do_predict to avoid any prediction based on a NaN
drop_index = pd.isnull(filtered_df).any(axis=1)
@@ -487,6 +488,24 @@ class FreqaiDataKitchen:
return df
+ def check_pred_labels(self, df_predictions: DataFrame) -> DataFrame:
+ """
+ Check that prediction feature labels match training feature labels.
+ :params:
+ :df_predictions: incoming predictions
+ """
+ train_labels = self.data_dictionary["train_features"].columns
+ pred_labels = df_predictions.columns
+ num_diffs = len(pred_labels.difference(train_labels))
+ if num_diffs != 0:
+ df_predictions = df_predictions[train_labels]
+ logger.warning(
+ f"Removed {num_diffs} features from prediction features, "
+ f"these were likely considered constant values during most recent training."
+ )
+
+ return df_predictions
+
def principal_component_analysis(self) -> None:
"""
Performs Principal Component Analysis on the data for dimensionality reduction
diff --git a/freqtrade/freqai/freqai_interface.py b/freqtrade/freqai/freqai_interface.py
index 58407ca5a..c0720cf9d 100644
--- a/freqtrade/freqai/freqai_interface.py
+++ b/freqtrade/freqai/freqai_interface.py
@@ -200,16 +200,15 @@ class IFreqaiModel(ABC):
(_, trained_timestamp, _) = self.dd.get_pair_dict_info(pair)
dk = FreqaiDataKitchen(self.config, self.live, pair)
- dk.set_paths(pair, trained_timestamp)
(
retrain,
new_trained_timerange,
data_load_timerange,
) = dk.check_if_new_training_required(trained_timestamp)
- dk.set_paths(pair, new_trained_timerange.stopts)
if retrain:
self.train_timer('start')
+ dk.set_paths(pair, new_trained_timerange.stopts)
try:
self.extract_data_and_train_model(
new_trained_timerange, pair, strategy, dk, data_load_timerange
@@ -290,9 +289,7 @@ class IFreqaiModel(ABC):
if dk.backtest_live_models:
timestamp_model_id = int(tr_backtest.startts)
- dk.data_path = Path(
- dk.full_path / f"sub-train-{pair.split('/')[0]}_{timestamp_model_id}"
- )
+ dk.set_paths(pair, timestamp_model_id)
dk.set_new_model_names(pair, timestamp_model_id)
diff --git a/freqtrade/freqai/prediction_models/CatboostClassifier.py b/freqtrade/freqai/prediction_models/CatboostClassifier.py
index 9a77644ed..2aebc3ebf 100644
--- a/freqtrade/freqai/prediction_models/CatboostClassifier.py
+++ b/freqtrade/freqai/prediction_models/CatboostClassifier.py
@@ -1,4 +1,5 @@
import logging
+from pathlib import Path
from typing import Any, Dict
from catboost import CatBoostClassifier, Pool
@@ -31,8 +32,9 @@ class CatboostClassifier(BaseClassifierModel):
)
cbr = CatBoostClassifier(
- allow_writing_files=False,
+ allow_writing_files=True,
loss_function='MultiClass',
+ train_dir=Path(dk.data_path),
**self.model_training_parameters,
)
diff --git a/freqtrade/freqai/prediction_models/CatboostRegressor.py b/freqtrade/freqai/prediction_models/CatboostRegressor.py
index 73cf6c88a..2978f6679 100644
--- a/freqtrade/freqai/prediction_models/CatboostRegressor.py
+++ b/freqtrade/freqai/prediction_models/CatboostRegressor.py
@@ -1,4 +1,5 @@
import logging
+from pathlib import Path
from typing import Any, Dict
from catboost import CatBoostRegressor, Pool
@@ -41,7 +42,8 @@ class CatboostRegressor(BaseRegressionModel):
init_model = self.get_init_model(dk.pair)
model = CatBoostRegressor(
- allow_writing_files=False,
+ allow_writing_files=True,
+ train_dir=Path(dk.data_path),
**self.model_training_parameters,
)
diff --git a/freqtrade/freqai/prediction_models/CatboostRegressorMultiTarget.py b/freqtrade/freqai/prediction_models/CatboostRegressorMultiTarget.py
index 7fa4e293e..de7a73e3a 100644
--- a/freqtrade/freqai/prediction_models/CatboostRegressorMultiTarget.py
+++ b/freqtrade/freqai/prediction_models/CatboostRegressorMultiTarget.py
@@ -1,4 +1,5 @@
import logging
+from pathlib import Path
from typing import Any, Dict
from catboost import CatBoostRegressor, Pool
@@ -26,7 +27,8 @@ class CatboostRegressorMultiTarget(BaseRegressionModel):
"""
cbr = CatBoostRegressor(
- allow_writing_files=False,
+ allow_writing_files=True,
+ train_dir=Path(dk.data_path),
**self.model_training_parameters,
)
diff --git a/freqtrade/misc.py b/freqtrade/misc.py
index 56b3fef0e..49d33d46f 100644
--- a/freqtrade/misc.py
+++ b/freqtrade/misc.py
@@ -6,7 +6,7 @@ import logging
import re
from datetime import datetime
from pathlib import Path
-from typing import Any, Iterator, List
+from typing import Any, Dict, Iterator, List, Mapping, Union
from typing.io import IO
from urllib.parse import urlparse
@@ -186,7 +186,10 @@ def safe_value_fallback(obj: dict, key1: str, key2: str, default_value=None):
return default_value
-def safe_value_fallback2(dict1: dict, dict2: dict, key1: str, key2: str, default_value=None):
+dictMap = Union[Dict[str, Any], Mapping[str, Any]]
+
+
+def safe_value_fallback2(dict1: dictMap, dict2: dictMap, key1: str, key2: str, default_value=None):
"""
Search a value in dict1, return this if it's not None.
Fall back to dict2 - return key2 from dict2 if it's not None.
diff --git a/freqtrade/plugins/pairlist/AgeFilter.py b/freqtrade/plugins/pairlist/AgeFilter.py
index 7c8cdb5ab..f9c02e250 100644
--- a/freqtrade/plugins/pairlist/AgeFilter.py
+++ b/freqtrade/plugins/pairlist/AgeFilter.py
@@ -10,6 +10,7 @@ from pandas import DataFrame
from freqtrade.constants import Config, ListPairsWithTimeframes
from freqtrade.exceptions import OperationalException
+from freqtrade.exchange.types import Tickers
from freqtrade.misc import plural
from freqtrade.plugins.pairlist.IPairList import IPairList
from freqtrade.util import PeriodicCache
@@ -67,7 +68,7 @@ class AgeFilter(IPairList):
f"{self._max_days_listed} {plural(self._max_days_listed, 'day')}"
) if self._max_days_listed else '')
- def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]:
+ def filter_pairlist(self, pairlist: List[str], tickers: Tickers) -> List[str]:
"""
:param pairlist: pairlist to filter or sort
:param tickers: Tickers (from exchange.get_tickers). May be cached.
diff --git a/freqtrade/plugins/pairlist/IPairList.py b/freqtrade/plugins/pairlist/IPairList.py
index 60abac6a1..660d6228c 100644
--- a/freqtrade/plugins/pairlist/IPairList.py
+++ b/freqtrade/plugins/pairlist/IPairList.py
@@ -4,11 +4,12 @@ PairList Handler base class
import logging
from abc import ABC, abstractmethod, abstractproperty
from copy import deepcopy
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
from freqtrade.constants import Config
from freqtrade.exceptions import OperationalException
from freqtrade.exchange import Exchange, market_is_active
+from freqtrade.exchange.types import Ticker, Tickers
from freqtrade.mixins import LoggingMixin
@@ -61,7 +62,7 @@ class IPairList(LoggingMixin, ABC):
-> Please overwrite in subclasses
"""
- def _validate_pair(self, pair: str, ticker: Dict[str, Any]) -> bool:
+ def _validate_pair(self, pair: str, ticker: Optional[Ticker]) -> bool:
"""
Check one pair against Pairlist Handler's specific conditions.
@@ -74,7 +75,7 @@ class IPairList(LoggingMixin, ABC):
"""
raise NotImplementedError()
- def gen_pairlist(self, tickers: Dict) -> List[str]:
+ def gen_pairlist(self, tickers: Tickers) -> List[str]:
"""
Generate the pairlist.
@@ -91,7 +92,7 @@ class IPairList(LoggingMixin, ABC):
raise OperationalException("This Pairlist Handler should not be used "
"at the first position in the list of Pairlist Handlers.")
- def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]:
+ def filter_pairlist(self, pairlist: List[str], tickers: Tickers) -> List[str]:
"""
Filters and sorts pairlist and returns the whitelist again.
@@ -110,7 +111,7 @@ class IPairList(LoggingMixin, ABC):
# Copy list since we're modifying this list
for p in deepcopy(pairlist):
# Filter out assets
- if not self._validate_pair(p, tickers[p] if p in tickers else {}):
+ if not self._validate_pair(p, tickers[p] if p in tickers else None):
pairlist.remove(p)
return pairlist
diff --git a/freqtrade/plugins/pairlist/OffsetFilter.py b/freqtrade/plugins/pairlist/OffsetFilter.py
index c9531ece1..8f21cdd85 100644
--- a/freqtrade/plugins/pairlist/OffsetFilter.py
+++ b/freqtrade/plugins/pairlist/OffsetFilter.py
@@ -6,6 +6,7 @@ from typing import Any, Dict, List
from freqtrade.constants import Config
from freqtrade.exceptions import OperationalException
+from freqtrade.exchange.types import Tickers
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -42,7 +43,7 @@ class OffsetFilter(IPairList):
return f"{self.name} - Taking {self._number_pairs} Pairs, starting from {self._offset}."
return f"{self.name} - Offsetting pairs by {self._offset}."
- def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]:
+ def filter_pairlist(self, pairlist: List[str], tickers: Tickers) -> List[str]:
"""
Filters and sorts pairlist and returns the whitelist again.
Called on each bot iteration - please use internal caching if necessary
diff --git a/freqtrade/plugins/pairlist/PerformanceFilter.py b/freqtrade/plugins/pairlist/PerformanceFilter.py
index 4cc92175a..e7fcac1e4 100644
--- a/freqtrade/plugins/pairlist/PerformanceFilter.py
+++ b/freqtrade/plugins/pairlist/PerformanceFilter.py
@@ -7,6 +7,7 @@ from typing import Any, Dict, List
import pandas as pd
from freqtrade.constants import Config
+from freqtrade.exchange.types import Tickers
from freqtrade.persistence import Trade
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -39,7 +40,7 @@ class PerformanceFilter(IPairList):
"""
return f"{self.name} - Sorting pairs by performance."
- def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]:
+ def filter_pairlist(self, pairlist: List[str], tickers: Tickers) -> List[str]:
"""
Filters and sorts pairlist and returns the allowlist again.
Called on each bot iteration - please use internal caching if necessary
diff --git a/freqtrade/plugins/pairlist/PrecisionFilter.py b/freqtrade/plugins/pairlist/PrecisionFilter.py
index 98cb3ba46..478eaec20 100644
--- a/freqtrade/plugins/pairlist/PrecisionFilter.py
+++ b/freqtrade/plugins/pairlist/PrecisionFilter.py
@@ -2,10 +2,11 @@
Precision pair list filter
"""
import logging
-from typing import Any, Dict
+from typing import Any, Dict, Optional
from freqtrade.constants import Config
from freqtrade.exceptions import OperationalException
+from freqtrade.exchange.types import Ticker
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -44,7 +45,7 @@ class PrecisionFilter(IPairList):
"""
return f"{self.name} - Filtering untradable pairs."
- def _validate_pair(self, pair: str, ticker: Dict[str, Any]) -> bool:
+ def _validate_pair(self, pair: str, ticker: Optional[Ticker]) -> bool:
"""
Check if pair has enough room to add a stoploss to avoid "unsellable" buys of very
low value pairs.
@@ -52,7 +53,7 @@ class PrecisionFilter(IPairList):
:param ticker: ticker dict as returned from ccxt.fetch_ticker
:return: True if the pair can stay, false if it should be removed
"""
- if ticker.get('last', None) is None:
+ if not ticker or ticker.get('last', None) is None:
self.log_once(f"Removed {pair} from whitelist, because "
"ticker['last'] is empty (Usually no trade in the last 24h).",
logger.info)
diff --git a/freqtrade/plugins/pairlist/PriceFilter.py b/freqtrade/plugins/pairlist/PriceFilter.py
index a6b400a38..4d23de792 100644
--- a/freqtrade/plugins/pairlist/PriceFilter.py
+++ b/freqtrade/plugins/pairlist/PriceFilter.py
@@ -2,10 +2,11 @@
Price pair list filter
"""
import logging
-from typing import Any, Dict
+from typing import Any, Dict, Optional
from freqtrade.constants import Config
from freqtrade.exceptions import OperationalException
+from freqtrade.exchange.types import Ticker
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -64,14 +65,16 @@ class PriceFilter(IPairList):
return f"{self.name} - No price filters configured."
- def _validate_pair(self, pair: str, ticker: Dict[str, Any]) -> bool:
+ def _validate_pair(self, pair: str, ticker: Optional[Ticker]) -> bool:
"""
Check if if one price-step (pip) is > than a certain barrier.
:param pair: Pair that's currently validated
:param ticker: ticker dict as returned from ccxt.fetch_ticker
:return: True if the pair can stay, false if it should be removed
"""
- if ticker.get('last', None) is None or ticker.get('last') == 0:
+ if ticker and 'last' in ticker and ticker['last'] is not None and ticker.get('last') != 0:
+ price: float = ticker['last']
+ else:
self.log_once(f"Removed {pair} from whitelist, because "
"ticker['last'] is empty (Usually no trade in the last 24h).",
logger.info)
@@ -79,8 +82,8 @@ class PriceFilter(IPairList):
# Perform low_price_ratio check.
if self._low_price_ratio != 0:
- compare = self._exchange.price_get_one_pip(pair, ticker['last'])
- changeperc = compare / ticker['last']
+ compare = self._exchange.price_get_one_pip(pair, price)
+ changeperc = compare / price
if changeperc > self._low_price_ratio:
self.log_once(f"Removed {pair} from whitelist, "
f"because 1 unit is {changeperc:.3%}", logger.info)
@@ -88,7 +91,6 @@ class PriceFilter(IPairList):
# Perform low_amount check
if self._max_value != 0:
- price = ticker['last']
market = self._exchange.markets[pair]
limits = market['limits']
if (limits['amount']['min'] is not None):
@@ -113,14 +115,14 @@ class PriceFilter(IPairList):
# Perform min_price check.
if self._min_price != 0:
- if ticker['last'] < self._min_price:
+ if price < self._min_price:
self.log_once(f"Removed {pair} from whitelist, "
f"because last price < {self._min_price:.8f}", logger.info)
return False
# Perform max_price check.
if self._max_price != 0:
- if ticker['last'] > self._max_price:
+ if price > self._max_price:
self.log_once(f"Removed {pair} from whitelist, "
f"because last price > {self._max_price:.8f}", logger.info)
return False
diff --git a/freqtrade/plugins/pairlist/ProducerPairList.py b/freqtrade/plugins/pairlist/ProducerPairList.py
index 740cb4ec2..882d49b76 100644
--- a/freqtrade/plugins/pairlist/ProducerPairList.py
+++ b/freqtrade/plugins/pairlist/ProducerPairList.py
@@ -7,6 +7,7 @@ import logging
from typing import Any, Dict, List, Optional
from freqtrade.exceptions import OperationalException
+from freqtrade.exchange.types import Tickers
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -68,7 +69,7 @@ class ProducerPairList(IPairList):
return pairs
- def gen_pairlist(self, tickers: Dict) -> List[str]:
+ def gen_pairlist(self, tickers: Tickers) -> List[str]:
"""
Generate the pairlist
:param tickers: Tickers (from exchange.get_tickers). May be cached.
@@ -79,7 +80,7 @@ class ProducerPairList(IPairList):
pairs = self._whitelist_for_active_markets(self.verify_whitelist(pairs, logger.info))
return pairs
- def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]:
+ def filter_pairlist(self, pairlist: List[str], tickers: Tickers) -> List[str]:
"""
Filters and sorts pairlist and returns the whitelist again.
Called on each bot iteration - please use internal caching if necessary
diff --git a/freqtrade/plugins/pairlist/ShuffleFilter.py b/freqtrade/plugins/pairlist/ShuffleFilter.py
index 6eb4231bc..1bc114d4e 100644
--- a/freqtrade/plugins/pairlist/ShuffleFilter.py
+++ b/freqtrade/plugins/pairlist/ShuffleFilter.py
@@ -7,6 +7,7 @@ from typing import Any, Dict, List
from freqtrade.constants import Config
from freqtrade.enums import RunMode
+from freqtrade.exchange.types import Tickers
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -47,7 +48,7 @@ class ShuffleFilter(IPairList):
return (f"{self.name} - Shuffling pairs" +
(f", seed = {self._seed}." if self._seed is not None else "."))
- def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]:
+ def filter_pairlist(self, pairlist: List[str], tickers: Tickers) -> List[str]:
"""
Filters and sorts pairlist and returns the whitelist again.
Called on each bot iteration - please use internal caching if necessary
diff --git a/freqtrade/plugins/pairlist/SpreadFilter.py b/freqtrade/plugins/pairlist/SpreadFilter.py
index 1f6d4f687..207328d08 100644
--- a/freqtrade/plugins/pairlist/SpreadFilter.py
+++ b/freqtrade/plugins/pairlist/SpreadFilter.py
@@ -2,10 +2,10 @@
Spread pair list filter
"""
import logging
-from typing import Any, Dict
+from typing import Any, Dict, Optional
from freqtrade.constants import Config
-from freqtrade.exceptions import OperationalException
+from freqtrade.exchange.types import Ticker
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -22,12 +22,6 @@ class SpreadFilter(IPairList):
self._max_spread_ratio = pairlistconfig.get('max_spread_ratio', 0.005)
self._enabled = self._max_spread_ratio != 0
- if not self._exchange.exchange_has('fetchTickers'):
- raise OperationalException(
- 'Exchange does not support fetchTickers, therefore SpreadFilter cannot be used.'
- 'Please edit your config and restart the bot.'
- )
-
@property
def needstickers(self) -> bool:
"""
@@ -44,14 +38,14 @@ class SpreadFilter(IPairList):
return (f"{self.name} - Filtering pairs with ask/bid diff above "
f"{self._max_spread_ratio:.2%}.")
- def _validate_pair(self, pair: str, ticker: Dict[str, Any]) -> bool:
+ def _validate_pair(self, pair: str, ticker: Optional[Ticker]) -> bool:
"""
Validate spread for the ticker
:param pair: Pair that's currently validated
:param ticker: ticker dict as returned from ccxt.fetch_ticker
:return: True if the pair can stay, false if it should be removed
"""
- if 'bid' in ticker and 'ask' in ticker and ticker['ask'] and ticker['bid']:
+ if ticker and 'bid' in ticker and 'ask' in ticker and ticker['ask'] and ticker['bid']:
spread = 1 - ticker['bid'] / ticker['ask']
if spread > self._max_spread_ratio:
self.log_once(f"Removed {pair} from whitelist, because spread "
diff --git a/freqtrade/plugins/pairlist/StaticPairList.py b/freqtrade/plugins/pairlist/StaticPairList.py
index 5b1337754..4b1961a53 100644
--- a/freqtrade/plugins/pairlist/StaticPairList.py
+++ b/freqtrade/plugins/pairlist/StaticPairList.py
@@ -8,6 +8,7 @@ from copy import deepcopy
from typing import Any, Dict, List
from freqtrade.constants import Config
+from freqtrade.exchange.types import Tickers
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -39,7 +40,7 @@ class StaticPairList(IPairList):
"""
return f"{self.name}"
- def gen_pairlist(self, tickers: Dict) -> List[str]:
+ def gen_pairlist(self, tickers: Tickers) -> List[str]:
"""
Generate the pairlist
:param tickers: Tickers (from exchange.get_tickers). May be cached.
@@ -53,7 +54,7 @@ class StaticPairList(IPairList):
return self._whitelist_for_active_markets(
self.verify_whitelist(self._config['exchange']['pair_whitelist'], logger.info))
- def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]:
+ def filter_pairlist(self, pairlist: List[str], tickers: Tickers) -> List[str]:
"""
Filters and sorts pairlist and returns the whitelist again.
Called on each bot iteration - please use internal caching if necessary
diff --git a/freqtrade/plugins/pairlist/VolatilityFilter.py b/freqtrade/plugins/pairlist/VolatilityFilter.py
index c06fc09ba..401a2e86c 100644
--- a/freqtrade/plugins/pairlist/VolatilityFilter.py
+++ b/freqtrade/plugins/pairlist/VolatilityFilter.py
@@ -13,6 +13,7 @@ from pandas import DataFrame
from freqtrade.constants import Config, ListPairsWithTimeframes
from freqtrade.exceptions import OperationalException
+from freqtrade.exchange.types import Tickers
from freqtrade.misc import plural
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -62,7 +63,7 @@ class VolatilityFilter(IPairList):
f"{self._min_volatility}-{self._max_volatility} "
f" the last {self._days} {plural(self._days, 'day')}.")
- def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]:
+ def filter_pairlist(self, pairlist: List[str], tickers: Tickers) -> List[str]:
"""
Validate trading range
:param pairlist: pairlist to filter or sort
diff --git a/freqtrade/plugins/pairlist/VolumePairList.py b/freqtrade/plugins/pairlist/VolumePairList.py
index bfecbd62a..ad27a93d8 100644
--- a/freqtrade/plugins/pairlist/VolumePairList.py
+++ b/freqtrade/plugins/pairlist/VolumePairList.py
@@ -5,13 +5,14 @@ Provides dynamic pair list based on trade volumes
"""
import logging
from datetime import datetime, timedelta, timezone
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Literal
from cachetools import TTLCache
from freqtrade.constants import Config, ListPairsWithTimeframes
from freqtrade.exceptions import OperationalException
from freqtrade.exchange import timeframe_to_minutes, timeframe_to_prev_date
+from freqtrade.exchange.types import Tickers
from freqtrade.misc import format_ms_time
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -36,7 +37,7 @@ class VolumePairList(IPairList):
self._stake_currency = config['stake_currency']
self._number_pairs = self._pairlistconfig['number_assets']
- self._sort_key = self._pairlistconfig.get('sort_key', 'quoteVolume')
+ self._sort_key: Literal['quoteVolume'] = self._pairlistconfig.get('sort_key', 'quoteVolume')
self._min_value = self._pairlistconfig.get('min_value', 0)
self._refresh_period = self._pairlistconfig.get('refresh_period', 1800)
self._pair_cache: TTLCache = TTLCache(maxsize=1, ttl=self._refresh_period)
@@ -110,7 +111,7 @@ class VolumePairList(IPairList):
"""
return f"{self.name} - top {self._pairlistconfig['number_assets']} volume pairs."
- def gen_pairlist(self, tickers: Dict) -> List[str]:
+ def gen_pairlist(self, tickers: Tickers) -> List[str]:
"""
Generate the pairlist
:param tickers: Tickers (from exchange.get_tickers). May be cached.
diff --git a/freqtrade/plugins/pairlist/rangestabilityfilter.py b/freqtrade/plugins/pairlist/rangestabilityfilter.py
index ca844f003..546b026cb 100644
--- a/freqtrade/plugins/pairlist/rangestabilityfilter.py
+++ b/freqtrade/plugins/pairlist/rangestabilityfilter.py
@@ -11,6 +11,7 @@ from pandas import DataFrame
from freqtrade.constants import Config, ListPairsWithTimeframes
from freqtrade.exceptions import OperationalException
+from freqtrade.exchange.types import Tickers
from freqtrade.misc import plural
from freqtrade.plugins.pairlist.IPairList import IPairList
@@ -60,7 +61,7 @@ class RangeStabilityFilter(IPairList):
f"{self._min_rate_of_change}{max_rate_desc} over the "
f"last {plural(self._days, 'day')}.")
- def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]:
+ def filter_pairlist(self, pairlist: List[str], tickers: Tickers) -> List[str]:
"""
Validate trading range
:param pairlist: pairlist to filter or sort
diff --git a/freqtrade/plugins/pairlistmanager.py b/freqtrade/plugins/pairlistmanager.py
index 5ed319e93..20a264fd8 100644
--- a/freqtrade/plugins/pairlistmanager.py
+++ b/freqtrade/plugins/pairlistmanager.py
@@ -11,6 +11,7 @@ from freqtrade.constants import Config, ListPairsWithTimeframes
from freqtrade.data.dataprovider import DataProvider
from freqtrade.enums import CandleType
from freqtrade.exceptions import OperationalException
+from freqtrade.exchange.types import Tickers
from freqtrade.mixins import LoggingMixin
from freqtrade.plugins.pairlist.IPairList import IPairList
from freqtrade.plugins.pairlist.pairlist_helpers import expand_pairlist
@@ -45,6 +46,15 @@ class PairListManager(LoggingMixin):
if not self._pairlist_handlers:
raise OperationalException("No Pairlist Handlers defined")
+ if self._tickers_needed and not self._exchange.exchange_has('fetchTickers'):
+ invalid = ". ".join([p.name for p in self._pairlist_handlers if p.needstickers])
+
+ raise OperationalException(
+ "Exchange does not support fetchTickers, therefore the following pairlists "
+ "cannot be used. Please edit your config and restart the bot.\n"
+ f"{invalid}."
+ )
+
refresh_period = config.get('pairlist_refresh_period', 3600)
LoggingMixin.__init__(self, logger, refresh_period)
@@ -76,7 +86,7 @@ class PairListManager(LoggingMixin):
return [{p.name: p.short_desc()} for p in self._pairlist_handlers]
@cached(TTLCache(maxsize=1, ttl=1800))
- def _get_cached_tickers(self):
+ def _get_cached_tickers(self) -> Tickers:
return self._exchange.get_tickers()
def refresh_pairlist(self) -> None:
diff --git a/freqtrade/rpc/api_server/api_ws.py b/freqtrade/rpc/api_server/api_ws.py
index f55b2dbd3..46909955d 100644
--- a/freqtrade/rpc/api_server/api_ws.py
+++ b/freqtrade/rpc/api_server/api_ws.py
@@ -4,6 +4,7 @@ from typing import Any, Dict
from fastapi import APIRouter, Depends, WebSocketDisconnect
from fastapi.websockets import WebSocket, WebSocketState
from pydantic import ValidationError
+from websockets.exceptions import WebSocketException
from freqtrade.enums import RPCMessageType, RPCRequestType
from freqtrade.rpc.api_server.api_auth import validate_ws_token
@@ -102,7 +103,6 @@ async def message_endpoint(
"""
try:
channel = await channel_manager.on_connect(ws)
-
if await is_websocket_alive(ws):
logger.info(f"Consumer connected - {channel}")
@@ -115,26 +115,31 @@ async def message_endpoint(
# Process the request here
await _process_consumer_request(request, channel, rpc)
- except WebSocketDisconnect:
+ except (WebSocketDisconnect, WebSocketException):
# Handle client disconnects
logger.info(f"Consumer disconnected - {channel}")
- await channel_manager.on_disconnect(ws)
- except Exception as e:
- logger.info(f"Consumer connection failed - {channel}")
- logger.exception(e)
+ except RuntimeError:
# Handle cases like -
# RuntimeError('Cannot call "send" once a closed message has been sent')
+ pass
+ except Exception as e:
+ logger.info(f"Consumer connection failed - {channel}: {e}")
+ logger.debug(e, exc_info=e)
+ finally:
await channel_manager.on_disconnect(ws)
else:
+ if channel:
+ await channel_manager.on_disconnect(ws)
await ws.close()
except RuntimeError:
# WebSocket was closed
- await channel_manager.on_disconnect(ws)
-
+ # Do nothing
+ pass
except Exception as e:
logger.error(f"Failed to serve - {ws.client}")
# Log tracebacks to keep track of what errors are happening
logger.exception(e)
+ finally:
await channel_manager.on_disconnect(ws)
diff --git a/freqtrade/rpc/api_server/webserver.py b/freqtrade/rpc/api_server/webserver.py
index 53af91477..c6639f1a6 100644
--- a/freqtrade/rpc/api_server/webserver.py
+++ b/freqtrade/rpc/api_server/webserver.py
@@ -198,10 +198,6 @@ class ApiServer(RPCHandler):
logger.debug(f"Found message of type: {message.get('type')}")
# Broadcast it
await self._ws_channel_manager.broadcast(message)
- # Limit messages per sec.
- # Could cause problems with queue size if too low, and
- # problems with network traffik if too high.
- await asyncio.sleep(0.001)
except asyncio.CancelledError:
pass
@@ -245,6 +241,7 @@ class ApiServer(RPCHandler):
use_colors=False,
log_config=None,
access_log=True if verbosity != 'error' else False,
+ ws_ping_interval=None # We do this explicitly ourselves
)
try:
self._server = UvicornServer(uvconfig)
diff --git a/freqtrade/rpc/api_server/ws/channel.py b/freqtrade/rpc/api_server/ws/channel.py
index 69a32e266..e9dbd63be 100644
--- a/freqtrade/rpc/api_server/ws/channel.py
+++ b/freqtrade/rpc/api_server/ws/channel.py
@@ -1,6 +1,7 @@
+import asyncio
import logging
from threading import RLock
-from typing import List, Optional, Type
+from typing import Any, Dict, List, Optional, Type
from uuid import uuid4
from fastapi import WebSocket as FastAPIWebSocket
@@ -34,6 +35,8 @@ class WebSocketChannel:
self._serializer_cls = serializer_cls
self._subscriptions: List[str] = []
+ self.queue: asyncio.Queue[Dict[str, Any]] = asyncio.Queue(maxsize=32)
+ self._relay_task = asyncio.create_task(self.relay())
# Internal event to signify a closed websocket
self._closed = False
@@ -48,12 +51,18 @@ class WebSocketChannel:
def remote_addr(self):
return self._websocket.remote_addr
- async def send(self, data):
+ async def _send(self, data):
"""
Send data on the wrapped websocket
"""
await self._wrapped_ws.send(data)
+ async def send(self, data):
+ """
+ Add the data to the queue to be sent
+ """
+ self.queue.put_nowait(data)
+
async def recv(self):
"""
Receive data on the wrapped websocket
@@ -72,6 +81,7 @@ class WebSocketChannel:
"""
self._closed = True
+ self._relay_task.cancel()
def is_closed(self) -> bool:
"""
@@ -95,6 +105,26 @@ class WebSocketChannel:
"""
return message_type in self._subscriptions
+ async def relay(self):
+ """
+ Relay messages from the channel's queue and send them out. This is started
+ as a task.
+ """
+ while True:
+ message = await self.queue.get()
+ try:
+ await self._send(message)
+ self.queue.task_done()
+
+ # Limit messages per sec.
+ # Could cause problems with queue size if too low, and
+ # problems with network traffik if too high.
+ # 0.001 = 1000/s
+ await asyncio.sleep(0.001)
+ except RuntimeError:
+ # The connection was closed, just exit the task
+ return
+
class ChannelManager:
def __init__(self):
@@ -155,12 +185,12 @@ class ChannelManager:
with self._lock:
message_type = data.get('type')
for websocket, channel in self.channels.copy().items():
- try:
- if channel.subscribed_to(message_type):
+ if channel.subscribed_to(message_type):
+ if not channel.queue.full():
await channel.send(data)
- except RuntimeError:
- # Handle cannot send after close cases
- await self.on_disconnect(websocket)
+ else:
+ logger.info(f"Channel {channel} is too far behind, disconnecting")
+ await self.on_disconnect(websocket)
async def send_direct(self, channel, data):
"""
diff --git a/freqtrade/rpc/discord.py b/freqtrade/rpc/discord.py
index c48508300..8be0eab68 100644
--- a/freqtrade/rpc/discord.py
+++ b/freqtrade/rpc/discord.py
@@ -11,13 +11,12 @@ logger = logging.getLogger(__name__)
class Discord(Webhook):
def __init__(self, rpc: 'RPC', config: Config):
- # super().__init__(rpc, config)
+ self._config = config
self.rpc = rpc
- self.config = config
self.strategy = config.get('strategy', '')
self.timeframe = config.get('timeframe', '')
- self._url = self.config['discord']['webhook_url']
+ self._url = config['discord']['webhook_url']
self._format = 'json'
self._retries = 1
self._retry_delay = 0.1
@@ -31,19 +30,21 @@ class Discord(Webhook):
def send_msg(self, msg) -> None:
- if msg['type'].value in self.config['discord']:
+ if msg['type'].value in self._config['discord']:
logger.info(f"Sending discord message: {msg}")
msg['strategy'] = self.strategy
msg['timeframe'] = self.timeframe
- fields = self.config['discord'].get(msg['type'].value)
+ fields = self._config['discord'].get(msg['type'].value)
color = 0x0000FF
if msg['type'] in (RPCMessageType.EXIT, RPCMessageType.EXIT_FILL):
profit_ratio = msg.get('profit_ratio')
color = (0x00FF00 if profit_ratio > 0 else 0xFF0000)
-
+ title = msg['type'].value
+ if 'pair' in msg:
+ title = f"Trade: {msg['pair']} {msg['type'].value}"
embeds = [{
- 'title': f"Trade: {msg['pair']} {msg['type'].value}",
+ 'title': title,
'color': color,
'fields': [],
@@ -51,7 +52,7 @@ class Discord(Webhook):
for f in fields:
for k, v in f.items():
v = v.format(**msg)
- embeds[0]['fields'].append( # type: ignore
+ embeds[0]['fields'].append(
{'name': k, 'value': v, 'inline': True})
# Send the message to discord channel
diff --git a/freqtrade/rpc/external_message_consumer.py b/freqtrade/rpc/external_message_consumer.py
index f5ba4b490..01bc974ad 100644
--- a/freqtrade/rpc/external_message_consumer.py
+++ b/freqtrade/rpc/external_message_consumer.py
@@ -62,7 +62,7 @@ class ExternalMessageConsumer:
self.enabled = self._emc_config.get('enabled', False)
self.producers: List[Producer] = self._emc_config.get('producers', [])
- self.wait_timeout = self._emc_config.get('wait_timeout', 300) # in seconds
+ self.wait_timeout = self._emc_config.get('wait_timeout', 30) # in seconds
self.ping_timeout = self._emc_config.get('ping_timeout', 10) # in seconds
self.sleep_time = self._emc_config.get('sleep_time', 10) # in seconds
@@ -174,6 +174,7 @@ class ExternalMessageConsumer:
:param producer: Dictionary containing producer info
:param lock: An asyncio Lock
"""
+ channel = None
while self._running:
try:
host, port = producer['host'], producer['port']
@@ -182,7 +183,11 @@ class ExternalMessageConsumer:
ws_url = f"ws://{host}:{port}/api/v1/message/ws?token={token}"
# This will raise InvalidURI if the url is bad
- async with websockets.connect(ws_url, max_size=self.message_size_limit) as ws:
+ async with websockets.connect(
+ ws_url,
+ max_size=self.message_size_limit,
+ ping_interval=None
+ ) as ws:
channel = WebSocketChannel(ws, channel_id=name)
logger.info(f"Producer connection success - {channel}")
@@ -224,6 +229,10 @@ class ExternalMessageConsumer:
logger.exception(e)
continue
+ finally:
+ if channel:
+ await channel.close()
+
async def _receive_messages(
self,
channel: WebSocketChannel,
diff --git a/freqtrade/rpc/rpc_manager.py b/freqtrade/rpc/rpc_manager.py
index e3b31d225..9c25723b0 100644
--- a/freqtrade/rpc/rpc_manager.py
+++ b/freqtrade/rpc/rpc_manager.py
@@ -88,10 +88,13 @@ class RPCManager:
"""
while queue:
msg = queue.popleft()
- self.send_msg({
- 'type': RPCMessageType.STRATEGY_MSG,
- 'msg': msg,
- })
+ logger.info('Sending rpc strategy_msg: %s', msg)
+ for mod in self.registered_modules:
+ if mod._config.get(mod.name, {}).get('allow_custom_messages', False):
+ mod.send_msg({
+ 'type': RPCMessageType.STRATEGY_MSG,
+ 'msg': msg,
+ })
def startup_messages(self, config: Config, pairlist, protections) -> None:
if config['dry_run']:
diff --git a/freqtrade/rpc/webhook.py b/freqtrade/rpc/webhook.py
index bb3b3922f..19c4166b3 100644
--- a/freqtrade/rpc/webhook.py
+++ b/freqtrade/rpc/webhook.py
@@ -3,7 +3,7 @@ This module manages webhook communication
"""
import logging
import time
-from typing import Any, Dict
+from typing import Any, Dict, Optional
from requests import RequestException, post
@@ -41,36 +41,44 @@ class Webhook(RPCHandler):
"""
pass
+ def _get_value_dict(self, msg: Dict[str, Any]) -> Optional[Dict[str, Any]]:
+ whconfig = self._config['webhook']
+ # Deprecated 2022.10 - only keep generic method.
+ if msg['type'] in [RPCMessageType.ENTRY]:
+ valuedict = whconfig.get('webhookentry')
+ elif msg['type'] in [RPCMessageType.ENTRY_CANCEL]:
+ valuedict = whconfig.get('webhookentrycancel')
+ elif msg['type'] in [RPCMessageType.ENTRY_FILL]:
+ valuedict = whconfig.get('webhookentryfill')
+ elif msg['type'] == RPCMessageType.EXIT:
+ valuedict = whconfig.get('webhookexit')
+ elif msg['type'] == RPCMessageType.EXIT_FILL:
+ valuedict = whconfig.get('webhookexitfill')
+ elif msg['type'] == RPCMessageType.EXIT_CANCEL:
+ valuedict = whconfig.get('webhookexitcancel')
+ elif msg['type'] in (RPCMessageType.STATUS,
+ RPCMessageType.STARTUP,
+ RPCMessageType.WARNING):
+ valuedict = whconfig.get('webhookstatus')
+ elif msg['type'].value in whconfig:
+ # Allow all types ...
+ valuedict = whconfig.get(msg['type'].value)
+ elif msg['type'] in (
+ RPCMessageType.PROTECTION_TRIGGER,
+ RPCMessageType.PROTECTION_TRIGGER_GLOBAL,
+ RPCMessageType.WHITELIST,
+ RPCMessageType.ANALYZED_DF,
+ RPCMessageType.STRATEGY_MSG):
+ # Don't fail for non-implemented types
+ return None
+ return valuedict
+
def send_msg(self, msg: Dict[str, Any]) -> None:
""" Send a message to telegram channel """
try:
- whconfig = self._config['webhook']
- if msg['type'] in [RPCMessageType.ENTRY]:
- valuedict = whconfig.get('webhookentry')
- elif msg['type'] in [RPCMessageType.ENTRY_CANCEL]:
- valuedict = whconfig.get('webhookentrycancel')
- elif msg['type'] in [RPCMessageType.ENTRY_FILL]:
- valuedict = whconfig.get('webhookentryfill')
- elif msg['type'] == RPCMessageType.EXIT:
- valuedict = whconfig.get('webhookexit')
- elif msg['type'] == RPCMessageType.EXIT_FILL:
- valuedict = whconfig.get('webhookexitfill')
- elif msg['type'] == RPCMessageType.EXIT_CANCEL:
- valuedict = whconfig.get('webhookexitcancel')
- elif msg['type'] in (RPCMessageType.STATUS,
- RPCMessageType.STARTUP,
- RPCMessageType.WARNING):
- valuedict = whconfig.get('webhookstatus')
- elif msg['type'] in (
- RPCMessageType.PROTECTION_TRIGGER,
- RPCMessageType.PROTECTION_TRIGGER_GLOBAL,
- RPCMessageType.WHITELIST,
- RPCMessageType.ANALYZED_DF,
- RPCMessageType.STRATEGY_MSG):
- # Don't fail for non-implemented types
- return
- else:
- raise NotImplementedError('Unknown message type: {}'.format(msg['type']))
+
+ valuedict = self._get_value_dict(msg)
+
if not valuedict:
logger.info("Message type '%s' not configured for webhooks", msg['type'])
return
diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py
index 8f803045f..96e3065c4 100644
--- a/freqtrade/strategy/interface.py
+++ b/freqtrade/strategy/interface.py
@@ -49,7 +49,7 @@ class IStrategy(ABC, HyperStrategyMixin):
_ft_params_from_file: Dict
# associated minimal roi
- minimal_roi: Dict = {}
+ minimal_roi: Dict = {"0": 10.0}
# associated stoploss
stoploss: float
diff --git a/requirements-freqai.txt b/requirements-freqai.txt
index cf0d2eb07..c78b3b25e 100644
--- a/requirements-freqai.txt
+++ b/requirements-freqai.txt
@@ -7,3 +7,4 @@ joblib==1.2.0
catboost==1.1; platform_machine != 'aarch64'
lightgbm==3.3.2
xgboost==1.6.2
+tensorboard==2.10.1
diff --git a/scripts/ws_client.py b/scripts/ws_client.py
index 83182ae9e..23ad9296d 100644
--- a/scripts/ws_client.py
+++ b/scripts/ws_client.py
@@ -82,7 +82,7 @@ def readable_timedelta(delta):
"""
attrs = ['years', 'months', 'days', 'hours', 'minutes', 'seconds', 'microseconds']
return ", ".join([
- '%d %s' % (getattr(delta, attr), attr if getattr(delta, attr) > 1 else attr[:-1])
+ '%d %s' % (getattr(delta, attr), attr if getattr(delta, attr) > 0 else attr[:-1])
for attr in attrs if getattr(delta, attr)
])
@@ -170,7 +170,7 @@ class ClientProtocol:
def _calculate_time_difference(self):
old_last_received_at = self._LAST_RECEIVED_AT
- self._LAST_RECEIVED_AT = time.time() * 1000
+ self._LAST_RECEIVED_AT = time.time() * 1e6
time_delta = relativedelta(microseconds=(self._LAST_RECEIVED_AT - old_last_received_at))
return readable_timedelta(time_delta)
@@ -238,7 +238,7 @@ async def create_client(
except (
asyncio.TimeoutError,
- websockets.exceptions.ConnectionClosed
+ websockets.exceptions.WebSocketException
):
# Try pinging
try:
@@ -298,7 +298,7 @@ async def _main(args):
producers = emc_config.get('producers', [])
producer = producers[0]
- wait_timeout = emc_config.get('wait_timeout', 300)
+ wait_timeout = emc_config.get('wait_timeout', 30)
ping_timeout = emc_config.get('ping_timeout', 10)
sleep_time = emc_config.get('sleep_time', 10)
message_size_limit = (emc_config.get('message_size_limit', 8) << 20)
@@ -311,7 +311,8 @@ async def _main(args):
sleep_time=sleep_time,
ping_timeout=ping_timeout,
wait_timeout=wait_timeout,
- max_size=message_size_limit
+ max_size=message_size_limit,
+ ping_interval=None
)
diff --git a/tests/exchange/test_ccxt_compat.py b/tests/exchange/test_ccxt_compat.py
index 9ff65cdc4..9f9866aba 100644
--- a/tests/exchange/test_ccxt_compat.py
+++ b/tests/exchange/test_ccxt_compat.py
@@ -56,7 +56,7 @@ EXCHANGES = {
'leverage_in_spot_market': True,
},
'kucoin': {
- 'pair': 'BTC/USDT',
+ 'pair': 'XRP/USDT',
'stake_currency': 'USDT',
'hasQuoteVolume': True,
'timeframe': '5m',
diff --git a/tests/exchange/test_exchange.py b/tests/exchange/test_exchange.py
index b07892f72..07aad80ff 100644
--- a/tests/exchange/test_exchange.py
+++ b/tests/exchange/test_exchange.py
@@ -1834,6 +1834,7 @@ def test_get_tickers(default_conf, mocker, exchange_name):
'last': 41,
}
}
+ mocker.patch('freqtrade.exchange.exchange.Exchange.exchange_has', return_value=True)
api_mock.fetch_tickers = MagicMock(return_value=tick)
api_mock.fetch_bids_asks = MagicMock(return_value={})
exchange = get_patched_exchange(mocker, default_conf, api_mock, id=exchange_name)
@@ -1883,6 +1884,11 @@ def test_get_tickers(default_conf, mocker, exchange_name):
assert api_mock.fetch_tickers.call_count == 1
assert api_mock.fetch_bids_asks.call_count == (1 if exchange_name == 'binance' else 0)
+ api_mock.fetch_tickers.reset_mock()
+ api_mock.fetch_bids_asks.reset_mock()
+ mocker.patch('freqtrade.exchange.exchange.Exchange.exchange_has', return_value=False)
+ assert exchange.get_tickers() == {}
+
@pytest.mark.parametrize("exchange_name", EXCHANGES)
def test_fetch_ticker(default_conf, mocker, exchange_name):
diff --git a/tests/freqai/conftest.py b/tests/freqai/conftest.py
index 026b45afc..df61b284a 100644
--- a/tests/freqai/conftest.py
+++ b/tests/freqai/conftest.py
@@ -107,6 +107,8 @@ def make_unfiltered_dataframe(mocker, freqai_conf):
unfiltered_dataframe = freqai.dk.use_strategy_to_populate_indicators(
strategy, corr_dataframes, base_dataframes, freqai.dk.pair
)
+ for i in range(5):
+ unfiltered_dataframe[f'constant_{i}'] = i
unfiltered_dataframe = freqai.dk.slice_dataframe(new_timerange, unfiltered_dataframe)
diff --git a/tests/freqai/test_freqai_interface.py b/tests/freqai/test_freqai_interface.py
index a61853c47..445b718d2 100644
--- a/tests/freqai/test_freqai_interface.py
+++ b/tests/freqai/test_freqai_interface.py
@@ -157,7 +157,7 @@ def test_extract_data_and_train_model_Classifiers(mocker, freqai_conf, model):
("CatboostClassifier", 6, "freqai_test_classifier")
],
)
-def test_start_backtesting(mocker, freqai_conf, model, num_files, strat):
+def test_start_backtesting(mocker, freqai_conf, model, num_files, strat, caplog):
freqai_conf.get("freqai", {}).update({"save_backtest_models": True})
freqai_conf['runmode'] = RunMode.BACKTEST
Trade.use_db = False
@@ -181,12 +181,23 @@ def test_start_backtesting(mocker, freqai_conf, model, num_files, strat):
corr_df, base_df = freqai.dd.get_base_and_corr_dataframes(sub_timerange, "LTC/BTC", freqai.dk)
df = freqai.dk.use_strategy_to_populate_indicators(strategy, corr_df, base_df, "LTC/BTC")
+ for i in range(5):
+ df[f'%-constant_{i}'] = i
+ # df.loc[:, f'%-constant_{i}'] = i
metadata = {"pair": "LTC/BTC"}
freqai.start_backtesting(df, metadata, freqai.dk)
model_folders = [x for x in freqai.dd.full_path.iterdir() if x.is_dir()]
assert len(model_folders) == num_files
+ assert log_has_re(
+ "Removed features ",
+ caplog,
+ )
+ assert log_has_re(
+ "Removed 5 features from prediction features, ",
+ caplog,
+ )
Backtesting.cleanup()
shutil.rmtree(Path(freqai.dk.full_path))
@@ -256,6 +267,7 @@ def test_start_backtesting_from_existing_folder(mocker, freqai_conf, caplog):
corr_df, base_df = freqai.dd.get_base_and_corr_dataframes(sub_timerange, "LTC/BTC", freqai.dk)
df = freqai.dk.use_strategy_to_populate_indicators(strategy, corr_df, base_df, "LTC/BTC")
+
freqai.start_backtesting(df, metadata, freqai.dk)
assert log_has_re(
@@ -312,6 +324,7 @@ def test_follow_mode(mocker, freqai_conf):
freqai.dd.load_all_pair_histories(timerange, freqai.dk)
df = strategy.dp.get_pair_dataframe('ADA/BTC', '5m')
+
freqai.start_live(df, metadata, strategy, freqai.dk)
assert len(freqai.dk.return_dataframe.index) == 5702
diff --git a/tests/rpc/test_rpc_manager.py b/tests/rpc/test_rpc_manager.py
index d71f38259..21c8b0813 100644
--- a/tests/rpc/test_rpc_manager.py
+++ b/tests/rpc/test_rpc_manager.py
@@ -99,6 +99,7 @@ def test_send_msg_telegram_error(mocker, default_conf, caplog) -> None:
def test_process_msg_queue(mocker, default_conf, caplog) -> None:
telegram_mock = mocker.patch('freqtrade.rpc.telegram.Telegram.send_msg')
+ default_conf['telegram']['allow_custom_messages'] = True
mocker.patch('freqtrade.rpc.telegram.Telegram._init')
freqtradebot = get_patched_freqtradebot(mocker, default_conf)
@@ -108,8 +109,8 @@ def test_process_msg_queue(mocker, default_conf, caplog) -> None:
queue.append('Test message 2')
rpc_manager.process_msg_queue(queue)
- assert log_has("Sending rpc message: {'type': strategy_msg, 'msg': 'Test message'}", caplog)
- assert log_has("Sending rpc message: {'type': strategy_msg, 'msg': 'Test message 2'}", caplog)
+ assert log_has("Sending rpc strategy_msg: Test message", caplog)
+ assert log_has("Sending rpc strategy_msg: Test message 2", caplog)
assert telegram_mock.call_count == 2
diff --git a/tests/rpc/test_rpc_webhook.py b/tests/rpc/test_rpc_webhook.py
index 3bbb85d54..a8fd0c34b 100644
--- a/tests/rpc/test_rpc_webhook.py
+++ b/tests/rpc/test_rpc_webhook.py
@@ -3,7 +3,6 @@
from datetime import datetime, timedelta
from unittest.mock import MagicMock
-import pytest
from requests import RequestException
from freqtrade.enums import ExitType, RPCMessageType
@@ -337,34 +336,18 @@ def test_exception_send_msg(default_conf, mocker, caplog):
caplog)
default_conf["webhook"] = get_webhook_dict()
- default_conf["webhook"]["webhookentry"]["value1"] = "{DEADBEEF:8f}"
+ default_conf["webhook"]["strategy_msg"] = {"value1": "{DEADBEEF:8f}"}
msg_mock = MagicMock()
mocker.patch("freqtrade.rpc.webhook.Webhook._send_msg", msg_mock)
webhook = Webhook(RPC(get_patched_freqtradebot(mocker, default_conf)), default_conf)
msg = {
- 'type': RPCMessageType.ENTRY,
- 'exchange': 'Binance',
- 'pair': 'ETH/BTC',
- 'limit': 0.005,
- 'order_type': 'limit',
- 'stake_amount': 0.8,
- 'stake_amount_fiat': 500,
- 'stake_currency': 'BTC',
- 'fiat_currency': 'EUR'
+ 'type': RPCMessageType.STRATEGY_MSG,
+ 'msg': 'hello world',
}
webhook.send_msg(msg)
assert log_has("Problem calling Webhook. Please check your webhook configuration. "
"Exception: 'DEADBEEF'", caplog)
- msg_mock = MagicMock()
- mocker.patch("freqtrade.rpc.webhook.Webhook._send_msg", msg_mock)
- msg = {
- 'type': 'DEADBEEF',
- 'status': 'whatever'
- }
- with pytest.raises(NotImplementedError):
- webhook.send_msg(msg)
-
# Test no failure for not implemented but known messagetypes
for e in RPCMessageType:
msg = {