Added some bigfixes for sell_tag

freqtrade/freqtradebot.py

@@ -856,14 +856,14 @@ class FreqtradeBot(LoggingMixin):
         """
         Check and execute sell
         """
-        print(str(sell_tag)+"1")
+
         should_sell = self.strategy.should_sell(
             trade, sell_rate, datetime.now(timezone.utc), buy, sell,
             force_stoploss=self.edge.stoploss(trade.pair) if self.edge else 0
         )
 
         if should_sell.sell_flag:
-            logger.info(f'Executing Sell for {trade.pair}. Reason: {should_sell.sell_type}. Tag: {sell_tag}')
+            logger.info(f'Executing Sell for {trade.pair}. Reason: {should_sell.sell_type}. Tag: {sell_tag if sell_tag is not None else "None"}')
             self.execute_trade_exit(trade, sell_rate, should_sell,sell_tag)
             return True
         return False
@@ -1142,7 +1142,8 @@ class FreqtradeBot(LoggingMixin):
         trade.sell_order_status = ''
         trade.close_rate_requested = limit
         trade.sell_reason = sell_reason.sell_reason
-        trade.sell_tag = sell_tag
+        if(sell_tag is not None):
+            trade.sell_tag = sell_tag
         # In case of market sell orders the order can be closed immediately
         if order.get('status', 'unknown') in ('closed', 'expired'):
             self.update_trade_state(trade, trade.open_order_id, order)

freqtrade/optimize/optimize_reports.py

@@ -399,6 +399,7 @@ def generate_strategy_stats(btdata: Dict[str, DataFrame],
     pair_results = generate_pair_metrics(btdata, stake_currency=stake_currency,
                                          starting_balance=starting_balance,
                                          results=results, skip_nan=False)
+
     buy_tag_results = generate_tag_metrics("buy_tag",btdata, stake_currency=stake_currency,
                                          starting_balance=starting_balance,
                                          results=results, skip_nan=False)
@@ -747,6 +748,11 @@ def show_backtest_result(strategy: str, results: Dict[str, Any], stake_currency:
         print(' BUY TAG STATS '.center(len(table.splitlines()[0]), '='))
     print(table)
 
+    table = text_table_tags("sell_tag",results['results_per_sell_tag'], stake_currency=stake_currency)
+
+    if isinstance(table, str) and len(table) > 0:
+        print(' SELL TAG STATS '.center(len(table.splitlines()[0]), '='))
+    print(table)
 
     table = text_table_sell_reason(sell_reason_stats=results['sell_reason_summary'],
                                    stake_currency=stake_currency)
@@ -768,11 +774,7 @@ def show_backtest_result(strategy: str, results: Dict[str, Any], stake_currency:
         print(' SUMMARY METRICS '.center(len(table.splitlines()[0]), '='))
     print(table)
 
-    table = text_table_tags("sell_tag",results['results_per_sell_tag'], stake_currency=stake_currency)
 
-    if isinstance(table, str) and len(table) > 0:
-        print(' SELL TAG STATS '.center(len(table.splitlines()[0]), '='))
-    print(table)
 
     if isinstance(table, str) and len(table) > 0:
         print('=' * len(table.splitlines()[0]))

freqtrade/persistence/migrations.py

@@ -48,6 +48,7 @@ def migrate_trades_table(decl_base, inspector, engine, table_back_name: str, col
     sell_reason = get_column_def(cols, 'sell_reason', 'null')
     strategy = get_column_def(cols, 'strategy', 'null')
     buy_tag = get_column_def(cols, 'buy_tag', 'null')
+    sell_tag = get_column_def(cols, 'sell_tag', 'null')
     # If ticker-interval existed use that, else null.
     if has_column(cols, 'ticker_interval'):
         timeframe = get_column_def(cols, 'timeframe', 'ticker_interval')

freqtrade/persistence/models.py

@@ -326,7 +326,7 @@ class LocalTrade():
             'profit_abs': self.close_profit_abs,
 
             'sell_reason':  (f' ({self.sell_reason})' if self.sell_reason else ''), #+str(self.sell_reason) ## CHANGE TO BUY TAG IF NEEDED
-            'sell_tag': self.sell_tag,
+            'sell_tag': (f' ({self.sell_tag})' if self.sell_tag else '') ,
             'sell_order_status': self.sell_order_status,
             'stop_loss_abs': self.stop_loss,
             'stop_loss_ratio': self.stop_loss_pct if self.stop_loss_pct else None,

freqtrade/strategy/interface.py

@@ -549,7 +549,7 @@ class IStrategy(ABC, HyperStrategyMixin):
         """
         if not isinstance(dataframe, DataFrame) or dataframe.empty:
             logger.warning(f'Empty candle (OHLCV) data for pair {pair}')
-            return False, False, None
+            return False, False, None, None
 
         latest_date = dataframe['date'].max()
         latest = dataframe.loc[dataframe['date'] == latest_date].iloc[-1]
@@ -564,7 +564,7 @@ class IStrategy(ABC, HyperStrategyMixin):
                 'Outdated history for pair %s. Last tick is %s minutes old',
                 pair, int((arrow.utcnow() - latest_date).total_seconds() // 60)
             )
-            return False, False, None
+            return False, False, None, None
 
         buy = latest[SignalType.BUY.value] == 1